keepalived: add enabled option

To prevent the keepalived service from starting if there is no valid
configuration yet, the new option enabled is added. This must be set to
true for keepalived to start.

Signed-off-by: Florian Eckert <[email protected]>

diff --git a/net/keepalived/files/keepalived.config b/net/keepalived/files/keepalived.config
index 3182518bdb99038c425a934a25aba58352499d38..4410514c42154a15b251ec79c0f63d962f760d69 100644 (file)
--- a/net/keepalived/files/keepalived.config
+++ b/net/keepalived/files/keepalived.config
@@ -1,4 +1,5 @@
 config globals 'globals'
+       option enabled '0'
 #      option alt_config_file          "/etc/keepalived/keepalived.conf"
 #      list notification_email         "[email protected]"
 #      list notification_email         "[email protected]"

diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init
index 20535a4b54960c50b7f27ec53a25a858a5dde76e..ac59c8103fe7f8db7920149f758dd028f59a56ea 100644 (file)
--- a/net/keepalived/files/keepalived.init
+++ b/net/keepalived/files/keepalived.init
@@ -600,7 +600,6 @@ process_config() {
        local alt_config_file linkbeat_use_polling
 
        rm -f "$KEEPALIVED_CONF"
-       [ -f /etc/config/keepalived ] || return 0
        config_load 'keepalived'
        config_get alt_config_file globals alt_config_file
 
@@ -654,14 +653,20 @@ reload_service() {
 }
 
 start_service() {
+       local enabled
+
+       [ -f /etc/config/keepalived ] || return 0
+
+       config_load 'keepalived'
+       config_get_bool enabled globals enabled 1
+       [ "$enabled" = "0" ] && return 0
+
+       process_config
+
        procd_open_instance
        procd_set_param command /usr/sbin/keepalived
        procd_append_param command -n # don't daemonize, procd will handle that for us
        procd_append_param command -f "$KEEPALIVED_CONF"
-
-       process_config
-
-       # set auto respawn behavior
        procd_set_param respawn
        procd_close_instance
 }